Merge pull request #1 from eric-ding/develop

no message
Merge pull request #2 from eric-ding/master

201406231700