Merge pull request #21 from michaelrice/development

version bump for release
Merge branch 'master' into development