edit by wangximing
edit by sigh
Merge pull request #1 from sighWang/master

XIming Wang