Merge pull request #1 from FOSS-Cloud/master

Merge branch 1.2 and master