small changes
Merge pull request #1 from MikeFarrow/master

small changes