Merge pull request #149 from igemsoftware/master

refresh
debug some bugs
Merge pull request #152 from igemsoftware/Victor

Victor