Merge pull request #94 from ctiller/fix

clang compile fixes