Merge pull request #115 from igemsoftware/master

Cao
Merge pull request #118 from igemsoftware/master

Master into Cao
123
Merge pull request #119 from igemsoftware/Cao

Cao