Merge branch 'release/0.5.6' into develop
Quick bug fix
Merge branch 'develop'