Improve Gambio detection
Merge pull request #621 from q--/Improve_Gambio_detection

Improve Gambio detection