Converted solution to VS2012;