fix several bugs
Merge branch 'master' of https://github.com/freedonaab/ChefCloudRealTime