Merge branch 'release/v2.4.1'
Make spacing around function names more consistent
Merge branch 'fhahn-master' into develop