Fix for weirdness in Cloud endpoints discovery
Merge pull request #38 from Scarygami/master

Fix for weirdness in Cloud endpoints discovery