Merge branch 'hotfix/Issue#9'
Solved Issue#12
Merge branch 'hotfix/Issue#12' into develop