#453, #454 Finish v0.5.0
- Resolves #453
- Resolves #454
Merge branch 'master' into develop