Merge pull request #146 from igemsoftware/master

master into Cao
Merge pull request #151 from igemsoftware/master

master into Cao
Merge pull request #160 from igemsoftware/master

Master into Cao
Merge pull request #169 from igemsoftware/master

Master into Cao
Merge pull request #177 from igemsoftware/master

Master into Cao
Merge pull request #150 from igemsoftware/Cao

Merge pull request #146 from igemsoftware/master