Added original patch by Jürgen