Some small fixes
Merge pull request #4 from mac22/master

Small fixes