Fix #8
Merge branch 'hotfix/issue8'