time for dinner!_test merge
Merge pull request #2 from wjingzhe/master

time for dinner!_test merge