Added cowboy.
Merge branch 'master' into cowboy

Conflicts:
	Makefile
Merge branch 'master' into cowboy