Merge pull request #134 from AzureAD/master

pull from master into dev