adding basic pagination
Adding album support