Customer did not like message
Merge branch 'hotfix/1.0.1'