Merge pull request #17 from mss1982/master

MS - Merge filters.
MS - Complete up/down filters.