Corrected things for pull request