Experimenting
Merge pull request #1 from lewtds/master

Experimenting
Refactor query function
Merge pull request #2 from NgoHuy/master

Refactor query function
Refactor query func