Merge pull request #350 from erickt/develop

Bump version