Merge pull request #1 from mph-/master

Avoid unnecessary reading of template.tex; allow space delimiter for directives