add query throwing machine
Merge pull request #70 from delihiros/query-throwing

add query throwing machine