Update README.md

Fixes #20 and #21