DAO general creada ;)
Merge origin/master