Some bugfixes, very nice clean feature added and undo handling