Fixed #207
Merge pull request #214 from felfert/master

Fixed #207