Refactored code and added filtering.
Added files.
Merge pull request #3 from MaiHo/Filtering

Filtering