Updated to work with Visual Studio 2015 Preview