Refactored options and added support for 0.9.

Closes #64 and #65