Merge pull request #2 from jaruesink/master

Merge1
Merge pull request #4 from jaruesink/Wesley

Merge pull request #2 from jaruesink/master