Merge "Corrected README and error message"