merge gh-pages and master v2.2.0