Merge pull request #90 from timothyarmes/master

Bug fixes and comment
Version bump