Added user and group filters, fix #12