glitch filtering
Merge branch 'develop'