some enhancements...
Merge remote-tracking branch 'origin/master'

Conflicts:
	tools/toolbox.py