Merge branch 'release/v0.5.0'
Bump version and Fix Tests
Merge branch 'hotfix/v0.5.1' into develop