Improved bham-proxy.
Merge branch 'master' into mac

Conflicts:
	bin/bham-proxy