Merge upstream changes: fix typo in cmd line error output, add new contributor in readme