Better template format by @nekcih proposed in #6