Progress Issue#21
Merge branch 'hotfix/Issue#21'