Included some changes from pull request. Reflowed text.