update demo
update guide
Merge branch 'master' of https://github.com/nikogu/tmpl