Merge pull request #181 from igemsoftware/master

master into Cao
Upload fixed
Merge pull request #182 from igemsoftware/Cao

Cao