Make set additional param more fluent
Remove wildcard import
Add methods to remove additional params
Merge branch 'pr/18'