update demo
Merge remote-tracking branch 'origin/thai' into gh-pages