Merge pull request #461 from marcel-sch/patch-1