Rc2 dev

Correction of bugs for requirement 32