Refactor
Merge branch 'LaTeX_documentation_holzi'
Merge branch 'master' into LaTeX_documentation_holzi