Se agrega f #18.
Merge branch 'f18'