Merge master and gh-pages

Bringing master branch up to date