Stop on more events, refs item:633
Merge pull request #417 from tlvince/bug/counter-scroll-bug

Stop on more events, closes item:633