Upgrade dependencies, adapt to all platforms
Merge pull request #1 from cloudControl/update

Upgrade dependencies, adapt to all platforms