Fixing options issue

Fixes #60