Merge pull request #100 from igemsoftware/Victor

Victor
Merge pull request #101 from igemsoftware/master

Merge pull request #100 from igemsoftware/Victor