Mostly translted to English
Merge branch 'master' into gh-pages