Merge pull request #191 from alexmckenley/dev

fixed scrolling issue