filter fix
Merge dev-master
Merge branch 'templating' of github.com:itdoors/sd into templating