Fixed paginator
Added pagination tests
Merge branch 'paginator' into develop
Update version
Merge branch 'release/3.2.1' into develop