Merge pull request #144 from sebix/feedback-riedel