move more stuff into SimpleQuery. fix deleting to close #7
Merge pull request #11 from keyvanfatehi/7_fix_deleting

move more stuff into SimpleQuery. fix deleting to close #7