Improved makefile with windows compatibility