Updated to reflect 1.0.7 changes