Merge pull request #5 from pchaigno/master

Update sources and fix issue with Linux client build