Updated to support VS 2013