added Tim Schumacher per pull request 26
added Michael Weibel per pull request 27