Merge branch 'gh-pages'
some changes
..
Merge branch 'master' into gh-pages