Merge pull request #105 from bastih/master

Fix clang++ behavior