a few changes
Merge pull request #3 from chiswilson/master

a few changes