Updates for 0.5.1
Merge branch 'release/0.5.1' into develop