Simon Schirrmacher

Is there any change to get this merged? Its been a long time since I implemented it and I am happy to solve the branch conflicts if there is still...