Include template name in measurement
Fix readme