Merge pull request #212 from igemsoftware/Branch-chyb

Branch chyb
T^Tdebug due to teammate
Merge pull request #213 from igemsoftware/master

Master into Branch-chyb