Erosion implemented
Merge branch 'dev' of github.com:smeyel/M3 into dev