Merge branch 'hotfix/0.6.2'
Resolve #38
Merge branch 'hotfix/0.6.3' into develop