Merge pull request #157 from igemsoftware/master

Victor
Merge pull request #159 from igemsoftware/master

Master into Victor
two kind of resolution
Try to solve conflicts
Merge pull request #162 from igemsoftware/Victor

Victor