The changes of this and last week

Hi Bjoern,
I'm still struggling a litle bit with the git stuff: I merged your "upstream" repository with my remote repository, I'm not sure if I'm supposed to do that and/or put it in the pull request.

Anyway: Some cleaning and two new tools. 4/23 done :)

Best,
Torsten