Vs2012

Changes to support Visual Studio 2012