Fixed #24
Merge branch 'hotfix/#24'
Merge tag '#24' into develop