Mutually interfering PRs

[mad99]

Hey Dominique,
please only use the last PullRequest if helpful.
First and Second mixed with curly Bracket. Couldn't find a way to delete PR's. So wrote third with all corrected and clean.