Update to pager
Merge of stuff from branch