Query before staging
Merge pull request #40 from syohex/query-before-staging

Query before staging