Add snapshots
Merge branch 'develop'