Tweak what Drew sent in (0.4.0), and bump for my changes (0.4.1).