Merge pull request #1 from cloudControl/dev

Dev