Resolve #38
Merge branch 'hotfix/0.6.3'