Updated to v1.0.7