Incorporates & documents new parameters added by @rparrish (Fixes #3, #5, #6)

Pulling from dev into master branch.