Improved for Visual Studio 2013