Merge pull request #125 from derhansen/master

Merge changes from Master
Merge pull request #126 from derhansen/master

Update README.md