Change to ignore a case of keywords
Refactor a code
Merge branch 'develop'