Merge branch 'hotfix/Issue#18'
Solve Issue#19
Merge branch 'hotfix/Issue#19' into develop