Added new Options class for parsing user-supplied options as well as defaults