Merge branch 'hotfix-1.0.1'
Fix voor #55
Fixed #44
Version bump
Merge branch 'hotfix-1.0.2' into development