Upgraded project to VS2012