Updated v1.0.6