Merge pull request #2 from MSOpenTech/master

Reverse integration into dev branch
Bug fix.
Merge pull request #5 from christav/dev

Bug fix.
Merge pull request #6 from MSOpenTech/dev

Dev