Merge pull request #60 from educloudalliance/master

Merging things up to data between branches.