Cleaning up for encounters.
Merge branch 'master' of https://github.com/alxdark/ionosphere