uncommitted code
fix merge conflict
Merge pull request #31 from DannyJoris/7.x

7.x