Upgraded solution to run under VS2012