Add Encounterer
Merge origin/master