Re-added pagination fixes #151