v0.6.1 - Finishing some suggestions