Giulio/rc 20131003/remove undo