Resolve #39
Merge branch 'hotfix/0.6.1'