Added compatibility to VS 2013