fix #8
Merge branch 'hotfix-8'