Merge pull request #3 from FOSS-Cloud/master

Merge pull request #2 from FOSS-Cloud/1.2
Merge pull request #4 from FOSS-Cloud/1.2

Merge pull request from FOSS-Cloud/master