0000517 + rework of filters
Merge branch 'master' of https://github.com/eisq/scpm