template control block changed to loop
Merge remote-tracking branch 'origin/master'