Merge branch 'test2'

Conflicts:
	threshold_Test.m
delete fix