Merge branch 'hotfix/Issue#21'
Merge branch 'master' into develop