Merge pull request #738 from stianst/Branch_1_0

Fixes