Updated solution for VS 2013 compatability