Changes made by jose ramirez (hlfapp@outlook.com).