Adds support for default values
Merge pull request #1 from serussell/master

Adds default options