Merge pull request #5 from marroquim/master

Merge pull request #3 from marroquim/master
included marco antonio and zuffo