Redefining constant strings, thanks to @kmikael
Merge branch 'refs/heads/hotfix/1.1.1'