Merge branch 'gh-pages'
added .html to url
Merge branch 'master' into gh-pages