version bump
Merge pull request #693 from aogilvie/develop

version bump