Made changes to merge VisualStudio2015UltimatePreview from alexinslc.
Merge pull request #14 from alexinslc/master

Made changes to merge VisualStudio2015UltimatePreview from alexinslc.