Minor changes
Merge pull request #35 from rocketfish/minorChanges

Minor changes