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

Victor
Merge pull request #102 from igemsoftware/Cao

Cao
Merge pull request #103 from igemsoftware/master

master into Cao