Detection and Mapping of Methane and Water on Mars