Removed japanese
Merge branch 'develop'