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

Master into Branch-chyb