Updated for windows
Fixed merge conflict
Fixed warning on class vs struct
Fixed int vs real weights