Updated documentation with suggestions of Tiago.