Template is even nicer now.
Fix for diagram
Merged project branch changes
Merge branch 'master' into projekt