Changed function defs to use kwargs (+ increased flexibility)
Merge pull request #29 from shannonturner/development

Changed function defs to use kwargs (+ increased flexibility)