Implement restore, closes #85, closes #86
Update changelog
Merge branch 'develop' into feature/daemon