Update.
Resolve some issues.
Merge branch 'refs/heads/gh-pages'