Merge pull request #1 from Jedzkie/Encounter

Commit.