Fix errors while building with clang
Merge pull request #150 from Chilledheart/master

Fix errors while building with clang (against libc++) under linux