Splitting use of values into values and options

- Fixes #22