Merge branch 'master' into gh-pages
updating documentation
Merge branch 'gh-pages'