Merge pull request #34 from MSOpenTech/master

Push changes to dev from master