Merge pull request #7 from itayB/master

pull
address filtering partially working
Merge pull request #7 from prsnca/master

Pulling updates from Yaron