Bug fixes
Merge pull request #90 from birjolaxew/master

Bug fixes