Fixed Undo issue
Merge branch 'master' of github.com:xtingray/tupi.mobile