Re-built with latest VisualStudio updates