JI-2 testing pull request
JI-2 fixed merge conflicts
Merge pull request #2 from Amentra/JI-2-test-pull-request

JI-2 testing pull request