Bring up to date with master

gh-pages was out of sync with master branch