Fix 343 344

Merged Jean-Didier Totow requested to merge fix_343_344 into morphemic-rc4.0

Merge request reports