Updated source and makefile to match standard.