Merge pull request #1 from FOSS-Cloud/master

Merge 1.2 to master