Merge pull request #2 from jaruesink/master

Merge1