Update README.md

Merge in changes from Pull Request fixes #21