Renamed conflicting variable
Merge branch 'master' of https://github.com/MartinWa/BlobUploader.git