update for v0.6.2
Merge branch 'develop' for v0.6.2