Minor tweaks for #68.
v2.0.1