Fix plugin not scrolling properly - fixes #54
Merge branch 'issue/#54'