Separated FilterRestriction and AccountFilter and fixed #59
Merge pull request #63 from henriquecf/59-separate-account-filter-from-filter-restriction

Separated FilterRestriction and AccountFilter and fixed #59