Added support for filters and refactored code dealing with binary data
Fixed Merge issue