fix to problems with uploading files
Merge branch 'release'