merge pull request #47, and make little change