Minor tweeks
Just minor changes that bothered me.
Merge pull request #12 from victor-baumbach/master

Minor tweeks