pull request nejires

dev nejires