Merge pull request #221 from steffen-kiess/master