merge gh-pages to master (tweaks)