@ace2nutzer, please check this. There was a trivial merge conflict, I hope I didn't mess anything.