Refactored getLocation to getCurrentPlanet for the sake of verbosity
Merge origin/master