Merge pull request #124 from DavidS/geppetto-infrastructure