Version bump
Merge pull request #814 from stianst/Branch_1_0

Version bump