some minor improvements
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
a bunch of  minor improvements