hotfix applied
main branch going on
Merge branch 'hotfix1'

Conflicts:
	main.c