Simplify & fix parameters
Merge pull request #29 from jphastings/params

Simplify & fix parameters