Merge with Patrick
Merge pull request #7 from PatrickDeelen/master

Merge with Patrick