Merge pull request #489 from 7sharp9/vnext

changes from master