delete master
Merge branch 'master' into v1.0.0

Conflicts:
	README.md