Prepare for Cloud 4->5
Merge pull request #11 from dirkmueller/master

Prepare for Cloud 4->5