Update build
Merge pull request #185 from jorgesilva/develop

Update build