New readme. Refactored options.
Refactored options. Updated readme.
Merge branch 'develop'