Merge pull request #799 from stianst/Branch_1_0

Branch 1 0
Version bump