Fixed #1
Merge branch 'hotfix/issue-#1'