Merge pull request #469 from 7sharp9/vnext

updates for vnext