Merge pull request #658 from stianst/master

Version bump