Fix bugs for clang-3.4
Merge branch 'master' of https://github.com/chen3feng/toft
Merge remote-tracking branch 'upstream/master' into HEAD