new changes on Maksim branch
Merge branch 'maksim' into integration

Conflicts:
	main.c