Merge pull request #91 from igemsoftware/Branch-chyb

Branch chyb
Merge pull request #95 from igemsoftware/master

Merge pull request #91 from igemsoftware/Branch-chyb