commit for close Issue #1 . Is it OK?