#298 imp
Merge pull request #330 from jonyrock/complex_undo

#298 imp - thanks!!! - hope you tested this well :)