fixes
Merge branch 'temp'

Conflicts:
	AdditionalFunctions.m