Merge pull request #152 from igemsoftware/Victor

Victor
Merge pull request #153 from igemsoftware/master

Merge pull request #152 from igemsoftware/Victor