config
Merge branch 'master' into 1452_cloud
Merge pull request #7 from lbondaryk/1452_cloud

1452 cloud