Config was missing a return
Minor corrections
Merge branch 'master' into develop