Rename of parameter to comply with the rest of the parameters
Merge branch 'master' into rename-param
Merge pull request #111 from bobvandevijver/rename-param

Rename of parameter to comply with the rest of the parameters