Merge pull request #1 from Jedzkie/Encounter

Commit.
Merge pull request #2 from Jedzkie/Jedzkie/Encounter

Commit