dont mix queries and datagrams
Merge pull request #49 from LipuFei/dont_mix_queries_and_datagrams

Don't mix queries and datagrams