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