Refactored options. Updated readme.