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

Fixed #35