Populate additional parameters (#3)
Don't overwrite, version
Merge pull request #5 from jphastings/additional

Populate additional parameters (#3)
Merge with upstream