Merge pull request #18 from juj/merge_clang_401

Merge clang 401