Updated v1.0.5