Merge pull request #139 from schuhschuh/master

Fix compilation of unittest on Ubuntu