Merge pull request #3 from bassman5/develop

Release v1.1
Merge pull request #4 from bassman5/master

Merge pull request #3 from bassman5/develop