Version bump
Merge pull request #748 from stianst/Branch_1_0

Version bump