fix issue #1
Merge branch 'hotfix_issue_1'