Refactored options and added support for 0.9.

This is no longer escaping the output path. Not sure if you meant to remove that or not.