Jörn Schoppe

Sorry to open another pull request so soon, but you merged my existing PR so fast that I couldn't include these small improvements ;-) I went through the code and...