Merge pull request #12 from jpluimers/master

A few more fixes