Minor fixes
Merge pull request #10 from randoum/master

Minor fixes