Fixed #26"
Merge branch 'hotfix/Issue#26'
Merge tag 'Issue#26' into develop

Fixed #26