Lergo-394,393,User Filter
Merge pull request #153 from lergo/lergo-394

Lergo-394,393,User Filter