I committed 3bc0d17. And when #141 is accepted, I merge it with this change.