combined/separate
Merge pull request #2 from query/master

combined/separate