Removes baddly written named paremeters
Merge branch 'master' into develop