change/fix 3 files
Merge pull request #13 from chiswilson/master

change/fix 3 files