Update build

Signed-off-by: Gary Pamparà <gpampara@gmail.com>
Manual merge of PR #210

Signed-off-by: Gary Pamparà <gpampara@gmail.com>
Merge remote-tracking branch 'upstream/master'