Fixed & v1.0.1