shorten the last time
Merge remote-tracking branch 'FlyJug/master'