Changes as per Sam Gordon (segordon - github). Thanks.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Makefile
	README
	statusbar.c