Initial commit
by yiguo
Merge branch 'master' into gh-pages