Fixed a few bugs with filter, fixed restul delete
Merge pull request #4 from mcharris/master

Fixed a few bugs with filter, fixed restul delete