Changes made by Anthonny Crespo (anthonny.crespo@gmail.com).