Merge pull request #159 from llh1/development

Bump version to match master branch