Updated makefile & packaging (windows)