baidu
Merge pull request #1 from cstmr/dev

baidu