filter improved
Merge pull request #28 from diegosarmentero/develop

filter improved