merged v1 branch with gh-pages

It works :D