Merge remote-tracking branch 'origin/without-pipes' into without-pipes

Conflicts:
	main.c