Merge pull request #177 from andhieka/working

Javier's Remarks
Fix bug with gotoContainingPage in UI
Merge remote-tracking branch 'upstream/master' into working