fix
Merge branch 'barceloneta'