minor fixes
Merge pull request #28 from lifey/master

minor fixes