Merge pull request #2 from cloudControl/dev

Dev