Merge pull request #1 from nossrf/master

Updated README.md
Merge pull request #2 from nossrf/master

Bug fixes and cleanup