Moved all potentially optional arguments into context methods.
Merge pull request #117 from mitchmindtree/master

Moved all potentially optional arguments into context methods.