Fixed issue #1
Merge branch 'hotfix/1'