proper filters
Merge branch 'master' of github.com:el-sonny/nomaspoderalpoder