Merge pull request #5 from khiven/Alvaro

Alvaro