Update option handling and README.md