Update main.cpp
Update main.cpp
Merge branch 'master' into Developmen

Conflicts:
	main.cpp
Merge branch 'Developmen'