Merge pull request #87 from tribal-tec/master

Fix downstream build
Fix Linux build