Merge pull request #63 from hzhuang1/clang_2

Clang 2