Development version.
Rename config parameter name.
Extract methods.
Add /remove.
Merge branch 'develop'
Master version.