F
Merge pull request #333 from dreamteam69/master

Fix Query