Merge pull request #6 from wico/master

rework for apache cloudstack