tweaks
Publish on gh-pages
Merge from master