Merging changes
Merge branch 'master' of https://github.com/pankessel/MetricFormalismPaper
worked in most changes suggested by the referees. But there is still some things to be done.