Restores the VS2010 compatibility
Linux compatibility restored
Windows compatibility restored