[CODE+DOC] Adjusted documentation and modified script


Signed-off-by: Francesco Robino <frobino@kth.se>