Merge branch 'hotfix/0.5.1'
Bump version 0.5.2
Merge branch 'hotfix/0.5.2' into develop