Options

Fixes #41