Merge branch 'master' into gh-pages
proudly created using github
Merge branch 'gh-pages'