Merge pull request #5 from HexSoftware/master

Updating My Fork
added filtering
Merge pull request #73 from nnordhof/master

added filtering