Add support for Infinite Scroll #17