primera version estable
Merge origin/master