Added full parameters
Merge pull request #30 from joshhornby/master

Added full parameters