Add model mods and small template customisation
Merge remote-tracking branch 'thanhiro/master'