Merge pull request #6 from marroquim/master

zuffo e romero
correction jorge lopes institution