edits
Merge pull request #215 from MartijnR/master

edits