Resolved conflict
Merge pull request #164 from jansmolders86/Rubenvanhoeyveld-patch-2

Resolved conflict