PEP8 Cosmetics
Merge branch 'feature_advanced_templating' into develop