Merge pull request #2 from etsicloud2014/master

preuba
Merge pull request #3 from etsicloud2014/borja

Merge pull request #2 from etsicloud2014/master