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