Updated v1.0.12