Resolve FIXME and fixes scrolling issue described in Github #49 (reported by Jeff Fortin)