Merge branch 'release/1.1.1'
Merge tag '1.1.1' into develop

Removed the hardcoded things
1.1.1