small fixes
Merge pull request #6 from aacarey/master

small fixes