Add Undo feature
Change Undo method
Add some filters
Merge pull request #2 from manhtuvjp/test

Merge *test* to *master*