Changes made by Jaime Sepúlveda (jaime.sepulvedag@gmail.com).