#85 - Added/improved pagination support