Added optional input parameters
Merge pull request #1 from maxfenton/master

Added optional input parameters