Fixed issue #22, and made minor improvements to README