Merge remote-tracking branch 'origin/master' into LC
Merge remote-tracking branch 'origin/LC'
Merge pull request #162 from igemsoftware/Victor

Victor
Merge pull request #163 from igemsoftware/master

Victor