bug fix
Merge branch 'hotfix/issue_5' fix #5