Merge branch 'getIND'

Conflicts:
	TE.S