First pull request about some changes

First pull request about some changes