Merge pull request #1 from thijsj/master

Diffs better readable