Merge pull request #1 from HybridSaaS/master

Merge master
Merge pull request #2 from Kuret/master

Merge pull request #1 from HybridSaaS/master