Cambios en Rakefile
Merge branches 'ivan' and 'master'