final Commit ver. 1.0.0.5