Fix backup time
Fix backup timeout
Merge pull request #113 from zoic21/master

Merge from master