Rework parameters. fixes #32
Merge pull request #34 from jphastings/headers

Rework parameters