Makefile Improvement! Thx To Florian