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

Fixed #18