Merge pull request #781 from stianst/Branch_1_0

Fixes