Merge pull request #213 from igemsoftware/master

Master into Branch-chyb
Final
Merge pull request #214 from igemsoftware/Branch-chyb

Branch chyb