Refactor and resolve issue #2.
Update README.md.