Fixed #32
Merge branch 'hotfix/Issue#32'
Merge tag 'Issue#32' into develop

Fixed #32