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

Fixed #21