small fixes
Merge pull request #2 from JackDougherty/master

small fixes