Merge pull request #4 from wangjiamr/master

2014-6-28
Merge pull request #6 from wangjiamr/master

1
Merge pull request #7 from wangjiamr/master

1
123
Merge pull request #2 from forMD/master

db