Added Dehaye+Zurich, modified Pons
Reading through what is already written, typos, consistency of macros
Merge pull request #6 from pdehaye/master

Paul-Olivier Dehaye templates, minor typos, consistency of macros