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

Fixed #25