Merge branch 'issues/72'

fix #72
v0.6.2
Merge branch 'support/v0.6'