Fixed grid.scrollIntoView()
Fixed small popup issue
Fixed issue #161
Fixed issue #156
Merge remote-tracking branch 'upstream/master'