Merge pull request #40 from pepijnve/master

Misc fixes