Upgraded to 1.0.7