Merge pull request #540 from whleung/master

Fixed issue #383; dragging down doesn't trigger scrolling