fixed filter
Merge branch 'develop' into shane
Merge pull request #28 from palmerhyde/shane

Fixed filter
Merge branch 'develop'