[Issue #205 #209][WIP] Salma fixed doc