Merge pull request #185 from igemsoftware/master

master into Cao
some changes
Merge pull request #189 from igemsoftware/Cao

Cao