Version bump
Merge pull request #687 from stianst/master

Version bump