Add listener for undo and redo
Merge branch 'develop'