Merge pull request #167 from igemsoftware/master

Victor
Merge pull request #171 from igemsoftware/master

Master into LC
debug some bugs
Merge pull request #174 from igemsoftware/Victor

Victor