Fixing issues
Merge remote-tracking branch 'alvaro/master'