Updated changes to master

Changes made after merging gh-pages to master