Merge pull request #1 from zhanglintc/master

//test comment by zhanglintc 2014.03.23 01:09
Merge pull request #2 from bernard-zh/master

Merge pull request #1 from zhanglintc/master