bugfix
Merge branch 'master' of github.com:fawques/cloud-in-one