#60 improve makefile