Merge pull request #3 from martinthomas/make_clang

Make clang
.
Merge remote-tracking branch 'origin/master' into make_clang