Merge branch 'Hagen'

…to have everything on the master again.
first merge didn't catch all changes