Refactored string filter
Merge branch 'master' of github.com:moser/foxtrot_mike