Merging upstream

Merge #2 and changes to tutorial pagination and CTA.