Merge pull request #19 from psychomario/master

update from original
Minor Cleanup/Organization

Cleaned up parameter order, name, and default values for more intuitive
use

Documentation was updated to reflect all changes and renaming
Merge pull request #47 from mmattioli/master

Minor Cleanup/Organization