Merge branch 'hotfix/Issue#8'
Edit sorame judge
Merge branch 'hotfix/Issue#8-1' into develop