Small fixes
Merge pull request #17 from jviereck/small-fixes

Small code cleanups