Merge pull request #9 from Asetss/master

fix #2360 and CreateQuery
Many fix #2360