Resolves issue #58 - Remove template match from output when template not provided