Added windows installer
Fixed merge