Merge pull request #2 from etsicloud2014/master

preuba