Pull request from gh-pages back to master

i accidentally edited the wrong branch, this is corrective action