Passing through additional parameters
Merged & added tests for #332