Merge pull request #31 from ARTFL-Project/master

merge downstream
fixed paging in filter reports
Merge pull request #305 from rwhaling/master

fixed paging in filter reports