Ver 1.0.0 Fixed