more changes
Merge pull request #24 from chiswilson/master

more changes