Remove old merge conflict
Merge pull request #23 from driesvints/patch-1

Remove old merge conflict