Before merging this PR I will update back to WindowsAzure (need to merge the SDK PR first)