Prepared for pull request