Markus Edit
Merge pull request #1 from schuettemarkus/master

Markus Edit - John D. confirmed