Merge pull request #120 from igemsoftware/master

Merge pull request #119 from igemsoftware/Cao
Merge pull request #122 from igemsoftware/master

master into Cao
Upload fix
Merge pull request #127 from igemsoftware/Cao

Cao