Merge pull request #214 from tobiasd/fix_1179