Updated
Merge pull request #194 from dreamsxin/model_beforequery

Updated