Merge branch 'hotfix/Issue#8-1'
Cannot solve Issue#7
Merge branch 'hotfix/Issue#7' into develop