Updated solution to support VS2013