#85 - Added pagination support