Tidying up
Redundant parameter is redundant`
Merge branch 'master' into gh-pages