template field is now binded
Merge remote-tracking branch 'origin/master'