Changes made by Samuel Sarmento (sam.sarmento@gmail.com).