fixed bug where page was rendered just before a new route was displayed
Merge remote-tracking branch 'origin/master'