LRA-187 pagination fixes
Merge pull request #15 from asotog/master

LRA-187 pagination fixes