Added restore feature
Update to v2.5.8
Update to v2.5.8