Improve backup option
Merge branch 'release/0.0.1'