Merge branch 'hotfix/0.1.6-7' into develop

* hotfix/0.1.6-7:
Messed up auto replacements.
Fixed refactoring as well.
Merge branch 'release/0.1.7'

* release/0.1.7:
  Fixed refactoring as well.
  Messed up auto replacements.