Merge branch 'gh-pages'
working on documentation
Merge branch 'master' into gh-pages