+ add "save me" checkbox
+ bug fix and improve
+