(bug) still fixing query
Merge pull request #37 from BaBuDe/master

(bug) still fixing query