Add support for more options
Add options tests
Update docs
Merge pull request #4 from swalkinshaw/patch-1

Add support for more options