removed a race condition
Merge branch 'master' of github.com:TheGranin/cloudcloudsystem