debug some bugs
Merge remote-tracking branch 'origin/master' into Victor
Merge pull request #100 from igemsoftware/Victor

Victor