Merge origin/master

Conflicts:
	main.cpp