Merge pull request #1 from HybridSaaS/master

Merge master