fix issue #18
Merge branch 'azure' into azure-1.1