Filtering update
Merge branch 'master' of github.com:xmonpp/xmonpp