Merge branch 'release/0.6.2' into develop
Another tweak for #85.
0.6.3
Merge branch 'release/0.6.3'