Pull request for SventB fork

Hi Benjamin,
when you receive this message I've done something wrong with creating a pull request. I want to merge your newest commits with my fork.
Sven