Merge pull request #506 from kunal3112/sas-uri