.
Merge pull request #361 from Pomax/mappingsv2

[nobug[ preview mapping, with scrollTo on click, proper rebase version (previous version was a halfway patch)