Upgrading to support VS 2013, .net 4.5 platform