Modifications related pull request made by Angel Serrano