Closes #3 -- Added query options