Fixed issue with first page redirect
Merge remote-tracking branch 'origin/master'