Add options param, new tests, and more docs