pull from mgarenas/CloudComputing.git