Merge pull request #1430 from akoeplinger/readme