more improvements
Merge remote-tracking branch 'origin/master'
more improvements
Merge remote-tracking branch 'origin/master'

Conflicts:
	includes/common.h
	src/config.c