Merge pull request #146 from igemsoftware/master

master into Cao