Changes to build/run on windows/visual studio 2010