Resolved merge conflict
Merge pull request #2 from oliversalzburg/patch-1

Resolved merge conflict