Merge pull request #2 from HybridSaaS/master

Merge master
Merge pull request #4 from Kuret/master

Merge pull request #2 from HybridSaaS/master