Fix #310
Fix template (Clone)
Merge remote-tracking branch 'base/master'