minor changes
Merge remote-tracking branch 'origin/Test'

Conflicts:
	src/main.c