Pull code back to master

Pulling code into master as the gh-pages approach is not viable