Optimized version
Merge remote-tracking branch 'origin/master'

Conflicts:
	2d model/V2/MainTester.m