fixed #10
Merge branch 'hotfix/10' into develop