Update contents
Fix Makefile