Fix #16: Query identification support
Merge pull request #17 from semberal/lse-id

Fix #16: Query identification support