fix #7
Merge branch 'hotfix/issue_7' fix #7