fixing filter and getting rid of printfs
Merge branch 'master' of https://github.com/lctyler/309