bringing in some 0.0.8 changes