I believe this has been merged by @yangshun in #165