Brought main branch in line with gh-pages