This probably merits a bump to 0.8.0 TBH