added conditional statements for filter_by
Merge pull request #5 from brabbins/master

added conditional statements for filter_by