New makefile with supports for windows
Corrections in makefile