Merge pull request #1 from forMD/master

zhenjia
1
Merge pull request #4 from wangjiamr/master

2014-6-28