Merge pull request #599 from cnryb/patch-1

improve