Better snapshotting on timeouts
Merge pull request #3 from jasperstein/master

Better snapshotting on timeouts