Visual Studio 2012 solution and fix for #287