Fixes and cleanup
Merge pull request #8 from RWOverdijk/hotfix/cleanup

Fixes and cleanup