Moved code to be able to merge with gh-pages