merged stephan's modifications into my working tree