master + readmeedits fixes #1

This merges both branches "master" and "readmeedits". It's self-explanatory, so I won't add anything more.