DOC: address @ogrisel comments