debug
Merge pull request #25 from zhangqianqian/master

debug