Fixed #49
Merge pull request #53 from sambohler/master

Fixed #49