minor fixes
Merge pull request #4 from rupertdance/master

minor fixes