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