Merge master to gh-pages

Update all of the changes