Merge pull request #2 from Azure/master

Pulling changes from Azure:master