Cleanup previous patch and other minor changes.
README: Add Michal Gawlik to the contributors.

Signed-off-by: Rüdiger Sonderfeld <ruediger@c-plusplus.de>