Merge

Updates to Github pages branch