Merge pull request #134 from AzureAD/master

pull from master into dev
Merge pull request #137 from AzureAD/dev

Merge pull request #134 from AzureAD/master