Merge gh-pages and master

Updated title