Merge pull request #134 from llh1/development

Bump version number to match master branch