Added filters
Conflicts
0.0.3