Updated Makefile for 3.0.
Updated Makefile for 3.0. Fixed lint issues.