Version 2 - merge with gh-pages

Merging version-2 with default branch, see commits for detailed list of changes.