merge master and added a live backup function