Handles IPs better to be compatible with libcloud
Merge pull request #597 from runseb/develop

Handles IPs better to be compatible with libcloud