Merge branch 'snapshot_support', closes #54