WIP
Merge pull request #2 from teresab/multiple_builds

WIP