Merge pull request #25 from MSOpenTech/master

Merging master changes back to dev branch