Fix #18.
Ship v0.8.7