#26 Added pagination