Merged changes from nikolay to implement Filters