Updated to work with VS2015 Preview