fixes
Merge pull request #3 from timsegraves/master

fixes