Added support for Japanese language, commenting