Merge branch 'master' into gh-pages
Fixed non-tralsated word
Merge branch 'gh-pages'