add snare
Merge origin/master