Merge branch 'release-1.0'
Hot fix for ticket 123
Merge branch 'hotfix-1.1' into develop