Merge pull request #2 from eric-ding/master

201406231700