Template uncommenting (fix #29)