Update build for Linux/Ubuntu
Merge pull request #122 from gabriele-v/master

Update build for Linux/Ubuntu