Add tests and doc for new options
Merge pull request #3 from edestecd/master

Add tests and doc for new options