Merge pull request #91 from igemsoftware/Branch-chyb

Branch chyb