Merge request

Merge gh-pages and patch-3