-Added cancel function with backup to restore old version upon canceling.
Merge origin/master