g1n0st Merge pull request #7 from taichi-dev/BillXu2000-patch-1