Merge branch 'hotfix/Issue#14'
Fixed Issue#15
Merge branch 'hotfix/Issue#15' into develop