Merge branch '1-pipe-support'

Conflicts:
	README.md