fixed some annoyances
Merge pull request #12 from JensTimmerman/master

fixed some annoyances