Also add address to index.html
Merge branch '0.6.x' into gh-pages