Merge branch 'master' into master_gitbook
Formatting english intro