Improve paging
Merge branch 'master' of github.com:jerolimov/wba2