Issue #240 , added infinite scrolling