Hot fix for ticket 123
Merge branch 'hotfix-1.1'