some renaming in unfolding routine
Merge branch 'master' of https://github.com/annekegh/mcdiff