Merge pull request #36 from etothepii/develop

merge in develop
Bumped version number
Merge pull request #37 from etothepii/master

Bumped version number