Merge pull request #16 from ClarkGH/master

Simple updates and readme fixes
Merge pull request #17 from ClarkGH/fixes

Merge pull request #16 from ClarkGH/master