Merge pull request #4 from brabbins/master

Changed php file to reflect ubc naming convention
added conditional statements for filter_by