Merge pull request #482 from 7sharp9/vnext

updates from master