Merge local/master into v0.0.1

Conflicts:
	LICENSE
	README.md