second commit by uloong-chlbd.
Merge pull request #1 from uloong-chlbd/master

second commit by uloong-chlbd.