don't flush stderr...
updated output
Merge branch 'master' into dev

Conflicts:
	src/main.c