minor changes
Merge pull request #12 from benweddel/master

minor changes