Added new options and improved options handling
Updated README to reflect changed/added options