I can fix this in a second version if needed. (I only fixed the merge conflicts so far.)