Changed redirect() function
Merge branch 'master' into clientjs