Had a problem with changing the name. Reverting back for now.
Merge branch 'hotfix/1.0.2.1'