slight adaptations for our dear colleague
Merge pull request #5 from DZoom/master

important changes