Merge pull request #40 from orbea/build