Merge pull request #74 from igemsoftware/Branch-chyb

Branch chyb
Merge pull request #77 from igemsoftware/master

Merge pull request #74 from igemsoftware/Branch-chyb