update makefile
Merge branch 'undo'