Changes to allow compiling on QtCreator MINGW for Windows as well as Visual Studio 2013