Should now handle page 2+
Merge branch 'master' into westerley