fix template engine
more docs
Merge remote-tracking branch 'origin/new' into new