commit
cc
Merge remote-tracking branch 'origin'
Merge pull request #50 from liaojia/master

prush