Recovery and snapshotting
Merge pull request #1 from jasperstein/master

Recovery and snapshotting