Merged pmilanez's  pull request on the original repo.