bug fixes
Merge branch 'master' of https://github.com/Widar91/cloud-computing-project.git