Merge branch 'hotfix/0.5.1'

* hotfix/0.5.1:
  fixing a typo
fixing a typo
Merge branch 'hotfix/0.5.2' into develop

* hotfix/0.5.2:
  fixing a typo