pull my changes

even though I could commit to LibertyEiffel/Liberty directly, I'd like you to review my changes beforehand