Think generate on entertime
Merge remote-tracking branch 'origin/master'