We implemented this for v1.x, but not for v0.x. See previous issue, #29. We should do this for the v0.x branch.
