fresh rebase + fix format in doc

Regards

Pavel