Update readme and comments based on changes from pull request #1 by Daniel Weil.