Merge pull request #192 from kberg/master
authorDan Vanderkam <danvdk@gmail.com>
Thu, 3 Jan 2013 19:01:30 +0000 (11:01 -0800)
committerDan Vanderkam <danvdk@gmail.com>
Thu, 3 Jan 2013 19:01:30 +0000 (11:01 -0800)
Options now includes default values. Fix bug so that you can set some options to null.


Trivial merge