changed querys
Merge origin/master
Merge origin/master
changed querys
Merge origin/master