Updated v1.0.7