Merge pull request #120 from xsacha/master

Linux build fix
Linux build fix.
Use travis for CI