Add documentation and new option and tests
Add a few more tests