conflict
Merge pull request #9 from jvanbrug/conflict

Merge