Compile fixes for windows
Using master for main.cpp
Fixed main.cpp