Bugfix
Merge pull request #74 from tomvantilburg/master

Bugfix