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

Fixed #22