Updated to support VS2013