Added pagination, resolves #18