JI-1 test for pull request
Merge pull request #1 from Amentra/hunter_branch

JI-1 test for pull request
JI-2 fixed merge conflicts