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

Fixed #28