New makefile (github, you happy now???)