Merge branches 'gh-pages' and 'master'
adapt for ios, added words
Merge branch 'master' into gh-pages