Resolved #2: added pagination