Merge branch 'dev'
Add forgotten tear method :'(
Merge branch 'master' into dev