Merge pull request #42 from MSOpenTech/dev

Dev