add letter, correct pagination count;
Merge origin/master