New options. Fixes #3