Filter features

Fix for #7 
Plus some tests