Merge branch 'hotfix/Issue#13'
Progress Issue#14
Merge branch 'hotfix/Issue#14' into develop