Minor fixes
Merge pull request #42 from ateich/master

Minor fixes