Merge pull request #119 from igemsoftware/Cao

Cao
Merge pull request #120 from igemsoftware/master

Merge pull request #119 from igemsoftware/Cao