commix on master
Merge branch 'master' into pull_request2

Conflicts:
	Readme