added return page after fetching
Merge remote-tracking branch 'upstream/master'