Bug fixes
Merge pull request #76 from erwinwinder/master

Bug fixes