Merge pull request #533 from alexwaters/readme