oakspoda
Merge remote-tracking branch 'origin/1.0.0' into 1.0.0

Conflicts:
	README.md