Fixed #24
Merge branch 'hotfix/#24'