changed queries in model
Merge branch 'master' into modelupdate
Merge pull request #10 from caisyn/modelupdate

Modelupdate