Rewrite part of snapshot feature to get connections correctly
Merge pull request #42 from ss23/snapshot-fix

Rewrite part of snapshot feature to get connections correctly