Added CommonMakefiles to dev dependencies
Update Makefile