Merged the fork and branch from xabi to Borja's master branch