Fix #59 - Infinite scrolling