Code optimization
Fix bug
Merge pull request #251 from dreamsxin/model

Model