Merge tag '2.0.1' into develop

Version 2.0.1
Add missing headline to default template.
Merge branch 'release/2.0.2'