0.5.8
Merge branch 'release/0.5.8' into develop