some configuration and output for performance meausrements
Merge branch 'master' into jit

Conflicts:
	src/main.c