Update readme
Merge remote-tracking branch 'totop/master' into master1

Conflicts:
	README.md