Fixes
Merge pull request #1 from willemt/fixes

Fixes