Bugfix: links count bigger than the total page count.
Merge branch 'master' into gh-pages